From 7c03f62206fdcb45ac4e888b4f33e295cdf52e81 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 30 May 2015 21:22:38 -0400
Subject: [PATCH] accel map: Fix compiler warnings

Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
---
 gtk/gtkaccelmap.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index c3a196d277..d5e53d35f7 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -132,7 +132,6 @@ enum {
 static GHashTable  *accel_entry_ht = NULL;	/* accel_path -> AccelEntry */
 static GSList      *accel_filters = NULL;
 static gulong	    accel_map_signals[LAST_SIGNAL] = { 0, };
-static GtkAccelMap *accel_map;
 
 /* --- prototypes --- */
 static void do_accel_map_changed (AccelEntry *entry);
@@ -1021,10 +1020,12 @@ gtk_accel_map_class_init (GtkAccelMapClass *accel_map_class)
 }
 
 static void
-gtk_accel_map_init (GtkAccelMap *accel_map)
+gtk_accel_map_init (GtkAccelMap *map)
 {
 }
 
+static GtkAccelMap *accel_map;
+
 /**
  * gtk_accel_map_get:
  * 
-- 
2.30.2